Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修正: cpu_num_threadsが未指定または0の場合に、論理コア数の半分をコアに渡すようにする #1113

Merged
merged 6 commits into from
Mar 8, 2024
Merged

修正: cpu_num_threadsが未指定または0の場合に、論理コア数の半分をコアに渡すようにする #1113

merged 6 commits into from
Mar 8, 2024

Conversation

tomoish
Copy link
Contributor

@tomoish tomoish commented Mar 8, 2024 •
edited
Loading

内容

  • cpu_num_threadsが未指定または0の場合に、論理コア数の半分をコアに渡すようにする
    • os.cpu_count()はNoneを返す可能性があり、その場合は以前と同様0を返す

関連 Issue

close #1092

@tomoish tomoish changed the title 修正 修正: cpu_num_threadsが未指定または0の場合に、論理コア数の半分をコアに渡すようにする Mar 8, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 8, 2024 •
edited
Loading

Coverage Result

Resultを開く
Name Stmts Miss Cover
run.py 513 218 coverage-58%
voicevox_engine/init.py 1 0 coverage-100%
voicevox_engine/cancellable_engine.py 94 72 coverage-23%
voicevox_engine/core/init.py 0 0 coverage-100%
voicevox_engine/core/core_adapter.py 81 12 coverage-85%
voicevox_engine/core/core_initializer.py 60 30 coverage-50%
voicevox_engine/core/core_wrapper.py 257 183 coverage-29%
voicevox_engine/dev/init.py 0 0 coverage-100%
voicevox_engine/dev/core/init.py 0 0 coverage-100%
voicevox_engine/dev/core/mock.py 65 4 coverage-94%
voicevox_engine/dev/tts_engine/init.py 0 0 coverage-100%
voicevox_engine/dev/tts_engine/mock.py 28 0 coverage-100%
voicevox_engine/engine_manifest/EngineManifest.py 36 0 coverage-100%
voicevox_engine/engine_manifest/EngineManifestLoader.py 12 0 coverage-100%
voicevox_engine/engine_manifest/init.py 0 0 coverage-100%
voicevox_engine/library_manager.py 92 4 coverage-96%
voicevox_engine/metas/Metas.py 36 0 coverage-100%
voicevox_engine/metas/MetasStore.py 28 1 coverage-96%
voicevox_engine/metas/init.py 0 0 coverage-100%
voicevox_engine/model.py 180 3 coverage-98%
voicevox_engine/morphing.py 71 4 coverage-94%
voicevox_engine/preset/Preset.py 13 0 coverage-100%
voicevox_engine/preset/PresetError.py 2 0 coverage-100%
voicevox_engine/preset/PresetManager.py 80 2 coverage-98%
voicevox_engine/preset/init.py 0 0 coverage-100%
voicevox_engine/setting/Setting.py 11 0 coverage-100%
voicevox_engine/setting/SettingLoader.py 17 0 coverage-100%
voicevox_engine/setting/init.py 0 0 coverage-100%
voicevox_engine/tts_pipeline/init.py 0 0 coverage-100%
voicevox_engine/tts_pipeline/kana_converter.py 88 1 coverage-99%
voicevox_engine/tts_pipeline/mora_mapping.py 7 0 coverage-100%
voicevox_engine/tts_pipeline/phoneme.py 34 0 coverage-100%
voicevox_engine/tts_pipeline/text_analyzer.py 146 6 coverage-96%
voicevox_engine/tts_pipeline/tts_engine.py 267 9 coverage-97%
voicevox_engine/user_dict/part_of_speech_data.py 5 0 coverage-100%
voicevox_engine/user_dict/user_dict.py 146 12 coverage-92%
voicevox_engine/utility/init.py 0 0 coverage-100%
voicevox_engine/utility/connect_base64_waves.py 37 0 coverage-100%
voicevox_engine/utility/core_utility.py 6 0 coverage-100%
voicevox_engine/utility/core_version_utility.py 8 1 coverage-88%
voicevox_engine/utility/mutex_utility.py 13 0 coverage-100%
voicevox_engine/utility/path_utility.py 26 6 coverage-77%
voicevox_engine/utility/run_utility.py 10 7 coverage-30%
TOTAL 2470 575 coverage-77%

@tomoish tomoish mentioned this pull request Mar 8, 2024
Closed
@tarepan tarepan marked this pull request as ready for review March 8, 2024 10:13
@tarepan tarepan requested a review from a team as a code owner March 8, 2024 10:13
@tarepan tarepan requested review from y-chan, Hiroshiba and tarepan and removed request for a team and y-chan March 8, 2024 10:13
@tarepan tarepan self-assigned this Mar 8, 2024
@tarepan tarepan added the バグ label Mar 8, 2024
tarepan
tarepan approved these changes Mar 8, 2024
View reviewed changes
Copy link
Contributor

@tarepan tarepan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM👍
os.cpu_count() による論理コア数取得に基づいてバグが修正されています。過剰なCPUリソース消費の防止により UX 改善が見込まれます。丁寧なテストも good!

@tarepan tarepan requested a review from sigprogramming March 8, 2024 10:17
@tarepan tarepan added the 優先度：中 重要 label Mar 8, 2024
sigprogramming
sigprogramming approved these changes Mar 8, 2024
View reviewed changes
Copy link

@sigprogramming sigprogramming left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTMです！！
修正ありがとうございます！

voicevox_engine/core/core_initializer.py Show resolved Hide resolved
@tarepan
Copy link
Contributor

tarepan commented Mar 8, 2024

ドキュメントの修正を確認しました。
レビュアー2名の approve により、本 PR は Go (merge) となります。
@tomoish さん、PR 作成と迅速なレビュー応答ありがとうございました！

@tarepan tarepan merged commit dc6bbbb into VOICEVOX:master Mar 8, 2024
4 checks passed
@Hiroshiba
Copy link
Member

こちら、一応破壊的変更の扱いで進めたいと思っています！
おそらく0.18アプデの時に入ると思います。その時にしっかりアナウンスして行きたいと思います！

@tarepan tarepan mentioned this pull request Mar 10, 2024
Open
3 tasks
@Hiroshiba Hiroshiba mentioned this pull request Mar 26, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sigprogramming sigprogramming sigprogramming approved these changes

@tarepan tarepan tarepan approved these changes

@Hiroshiba Hiroshiba Awaiting requested review from Hiroshiba

Assignees

@tarepan tarepan

Labels
バグ 優先度：中 重要
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cpu_num_threadsが未指定または0の場合に、論理コア数の半分をコアに渡すようにする
4 participants
@tomoish @tarepan @Hiroshiba @sigprogramming